Patch from Damon Chaplin to free models when we're finalized, #134053

Fri Mar  5 02:53:41 2004  Jonathan Blandford  <jrb@gnome.org>

        * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_finalize):
        Patch from Damon Chaplin to free models when we're finalized,
        #134053

diff --git a/ChangeLog b/ChangeLog
index 51db8459f69ea7bd1a50f8b6c7099b9a49841280..9776afbe68f9a674037c89f090add91cf3fa8835 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Mar  5 02:53:41 2004  Jonathan Blandford  <jrb@gnome.org>
+
+       * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_finalize):
+       Patch from Damon Chaplin to free models when we're finalized,
+       #134053
+
 2004-03-05  Alexander Larsson  <alexl@redhat.com>
 
        * gtk/gtkfilesystem.c (gtk_file_system_get_volume_for_path):

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 51db8459f69ea7bd1a50f8b6c7099b9a49841280..9776afbe68f9a674037c89f090add91cf3fa8835 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Fri Mar  5 02:53:41 2004  Jonathan Blandford  <jrb@gnome.org>
+
+       * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_finalize):
+       Patch from Damon Chaplin to free models when we're finalized,
+       #134053
+
 2004-03-05  Alexander Larsson  <alexl@redhat.com>
 
        * gtk/gtkfilesystem.c (gtk_file_system_get_volume_for_path):

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 51db8459f69ea7bd1a50f8b6c7099b9a49841280..9776afbe68f9a674037c89f090add91cf3fa8835 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Fri Mar  5 02:53:41 2004  Jonathan Blandford  <jrb@gnome.org>
+
+       * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_finalize):
+       Patch from Damon Chaplin to free models when we're finalized,
+       #134053
+
 2004-03-05  Alexander Larsson  <alexl@redhat.com>
 
        * gtk/gtkfilesystem.c (gtk_file_system_get_volume_for_path):

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 51db8459f69ea7bd1a50f8b6c7099b9a49841280..9776afbe68f9a674037c89f090add91cf3fa8835 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Fri Mar  5 02:53:41 2004  Jonathan Blandford  <jrb@gnome.org>
+
+       * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_finalize):
+       Patch from Damon Chaplin to free models when we're finalized,
+       #134053
+
 2004-03-05  Alexander Larsson  <alexl@redhat.com>
 
        * gtk/gtkfilesystem.c (gtk_file_system_get_volume_for_path):

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 51db8459f69ea7bd1a50f8b6c7099b9a49841280..9776afbe68f9a674037c89f090add91cf3fa8835 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Fri Mar  5 02:53:41 2004  Jonathan Blandford  <jrb@gnome.org>
+
+       * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_finalize):
+       Patch from Damon Chaplin to free models when we're finalized,
+       #134053
+
 2004-03-05  Alexander Larsson  <alexl@redhat.com>
 
        * gtk/gtkfilesystem.c (gtk_file_system_get_volume_for_path):

diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index 8369716d3437602b2400a40824457379a090f59a..bbb3a36a60969819f2d7e87501a28b6f79bc5172 100644 (file)
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -551,6 +551,22 @@ gtk_file_chooser_default_finalize (GObject *object)
   if (impl->preview_path)
     gtk_file_path_free (impl->preview_path);
 
+  /* Free all the Models we have */
+  if (impl->browse_files_model)
+    g_object_unref (impl->browse_files_model);
+
+  if (impl->browse_directories_model)
+    g_object_unref (impl->browse_directories_model);
+
+  if (impl->shortcuts_model)
+    g_object_unref (impl->shortcuts_model);
+
+  if (impl->shortcuts_filter_model)
+    g_object_unref (impl->shortcuts_filter_model);
+
+  if (impl->sort_model)
+    g_object_unref (impl->sort_model);
+
   g_free (impl->preview_display_name);
 
   G_OBJECT_CLASS (parent_class)->finalize (object);